- pl = append(pl, fmt.Sprintf("%s%s%s", pkg, ver, pin))
+ pl = append(pl, fmt.Sprintf("%s%s%s", pkg, pin, ver))

diff --git a/pkg/apk/apk/version.go b/pkg/apk/apk/version.go
index 185dbf7..5d88922 100644
--- a/pkg/apk/apk/version.go
+++ b/pkg/apk/apk/version.go
@@ -37,7 +37,7 @@ import (
 
 var (
        versionRegex     = regexp.MustCompile(`^([0-9]+)((\.[0-9]+)*)([a-z]?)((_alpha|_beta|_pre|_rc)([0-9]*))?((_cvs|_svn|_git|_hg|_p)([0-9]*))?((-r)([0-9]+))?$`)
-       packageNameRegex = regexp.MustCompile(`^([^@=><~]+)(([=><~]+)([^@]+))?(@([a-zA-Z0-9]+))?$`)
+       packageNameRegex = regexp.MustCompile(`^([^@=><~]+)(@([a-zA-Z0-9]+))?(([=><~]+)([^@]+))?$`)
 )
 
 func init() {
@@ -367,12 +367,12 @@ func resolvePackageNameVersionPin(pkgName string) parsedConstraint {
        // layout: [full match, name, =version, =|>|<, version, @pin, pin]
        p := parsedConstraint{
                name:    parts[0][1],
-               version: parts[0][4],
-               pin:     parts[0][6],
+               pin:     parts[0][3],
+               version: parts[0][6],
                dep:     versionAny,
        }
 
-       matcher := parts[0][3]
+       matcher := parts[0][5]
        if matcher != "" {
                // we have an equal
                switch matcher {
diff --git a/pkg/apk/apk/version_test.go b/pkg/apk/apk/version_test.go
index 1e99665..9e6afd4 100644
--- a/pkg/apk/apk/version_test.go
+++ b/pkg/apk/apk/version_test.go
@@ -933,8 +933,8 @@ func TestResolverPackageNameVersionPin(t *testing.T) {
                {"name<1.2.3", "name", "1.2.3", versionLess, ""},
                {"name>=1.2.3", "name", "1.2.3", versionGreaterEqual, ""},
                {"name<=1.2.3", "name", "1.2.3", versionLessEqual, ""},
-               {"name@edge=1.2.3", "name@edge=1.2.3", "", versionAny, ""}, // wrong order, so just returns the whole thing
-               {"name=1.2.3@community", "name", "1.2.3", versionEqual, "community"},
+               {"name@edge=1.2.3", "name", "1.2.3", versionEqual, "edge"},
+               {"name=1.2.3@community", "name=1.2.3@community", "", versionAny, ""}, // wrong order, so just returns the whole thing
        }
 
        for _, tt := range tests {
diff --git a/pkg/build/lock.go b/pkg/build/lock.go
index e00e858..c36e096 100644
--- a/pkg/build/lock.go
+++ b/pkg/build/lock.go
@@ -145,8 +145,8 @@ func unify(originals []string, inputs []resolved) (map[string][]string, map[stri
                }
 
                // Extract pinned version if present
-               if idx := strings.IndexAny(orig, "@"); idx >= 0 {
-                       pinned = orig[idx:]
+               if idx := strings.IndexAny(name, "@"); idx >= 0 {
+                       pinned = name[idx:]
                }
 
                // Remove pinned suffix from name and version
@@ -256,10 +256,11 @@ func unify(originals []string, inputs []resolved) (map[string][]string, map[stri
        // Append all of the resolved and unified packages with an exact match
        // based on the resolved version we found.
        for _, pkg := range sets.List(acc.packages) {
-               pkgName := fmt.Sprintf("%s=%s", pkg, acc.versions[pkg])
+               pkgName := pkg
                if pin := originalPackages.pinned[pkg]; pin != "" {
                        pkgName = fmt.Sprintf("%s%s", pkgName, pin)
                }
+               pkgName = fmt.Sprintf("%s=%s", pkgName, acc.versions[pkg])
                pl = append(pl, pkgName)
        }
        // Sort the package list explicitly with the `=` included.
@@ -274,10 +275,11 @@ func unify(originals []string, inputs []resolved) (map[string][]string, map[stri
        for _, input := range inputs {
                pl := make([]string, 0, len(input.packages))
                for _, pkg := range sets.List(input.packages) {
-                       pkgName := fmt.Sprintf("%s=%s", pkg, input.versions[pkg])
+                       pkgName := pkg
                        if pin := originalPackages.pinned[pkg]; pin != "" {
                                pkgName = fmt.Sprintf("%s%s", pkgName, pin)
                        }
+                       pkgName = fmt.Sprintf("%s=%s", pkgName, input.versions[pkg])
                        pl = append(pl, pkgName)
                }
                // Sort the package list explicitly with the `=` included.
@@ -304,4 +306,4 @@ func unify(originals []string, inputs []resolved) (map[string][]string, map[stri
 }
 
 // Copied from go-apk's version.go
-var packageNameRegex = regexp.MustCompile(`^([^@=><~]+)(([=><~]+)([^@]+))?(@([a-zA-Z0-9]+))?$`)
+var packageNameRegex = regexp.MustCompile(`^([^@=><~]+)(@([a-zA-Z0-9]+))?(([=><~]+)([^@]+))?$`)